Don't use bitops on booleans.

2004-09-22  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkfilechooserdefault.c (selection_check_foreach_cb): Don't use
	bitops on booleans.

diff --git a/ChangeLog b/ChangeLog
index eb94b6a3979580e4b4027fb1757612bc215c74b3..93c211fde9ad3b2a71a72e5d90783f83ceeda847 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-22  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkfilechooserdefault.c (selection_check_foreach_cb): Don't use
+       bitops on booleans.
+
 Wed Sep 22 00:54:34 2004  Matthias Clasen  <mclasen@redhat.com>
 
        * demos/gtk-demo/pixbufs.c (do_pixbufs): Don't leak the frame

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index eb94b6a3979580e4b4027fb1757612bc215c74b3..93c211fde9ad3b2a71a72e5d90783f83ceeda847 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2004-09-22  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkfilechooserdefault.c (selection_check_foreach_cb): Don't use
+       bitops on booleans.
+
 Wed Sep 22 00:54:34 2004  Matthias Clasen  <mclasen@redhat.com>
 
        * demos/gtk-demo/pixbufs.c (do_pixbufs): Don't leak the frame

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index eb94b6a3979580e4b4027fb1757612bc215c74b3..93c211fde9ad3b2a71a72e5d90783f83ceeda847 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2004-09-22  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkfilechooserdefault.c (selection_check_foreach_cb): Don't use
+       bitops on booleans.
+
 Wed Sep 22 00:54:34 2004  Matthias Clasen  <mclasen@redhat.com>
 
        * demos/gtk-demo/pixbufs.c (do_pixbufs): Don't leak the frame

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index eb94b6a3979580e4b4027fb1757612bc215c74b3..93c211fde9ad3b2a71a72e5d90783f83ceeda847 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2004-09-22  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkfilechooserdefault.c (selection_check_foreach_cb): Don't use
+       bitops on booleans.
+
 Wed Sep 22 00:54:34 2004  Matthias Clasen  <mclasen@redhat.com>
 
        * demos/gtk-demo/pixbufs.c (do_pixbufs): Don't leak the frame

diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index b743d3359c82f6a1b4eed299f877ecf9aa3fec2d..58ebb07e0feda92bf5273d45ace5d7b23524cdc0 100644 (file)
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -1913,8 +1913,8 @@ selection_check_foreach_cb (GtkTreeModel *model,
   info = _gtk_file_system_model_get_info (closure->impl->browse_files_model, &child_iter);
   is_folder = gtk_file_info_get_is_folder (info);
 
-  closure->all_folders &= is_folder;
-  closure->all_files &= !is_folder;
+  closure->all_folders = closure->all_folders && is_folder;
+  closure->all_files = closure->all_files && !is_folder;
 }
 
 /* Checks whether the selected items in the file list are all files or all folders */